From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 5 Mar 2010 14:42:25 +0000 (+0000)
Subject: xend: XenAPI does not support pvSCSI multipath
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12538
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=05eacf31fd50202e44a4e6a3a2faf0402ee97b71;p=xen.git

xend: XenAPI does not support pvSCSI multipath

Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
---

diff --git a/tools/python/xen/xend/XendNode.py b/tools/python/xen/xend/XendNode.py
index 6541b63f54..fa3cba1944 100644
--- a/tools/python/xen/xend/XendNode.py
+++ b/tools/python/xen/xend/XendNode.py
@@ -333,7 +333,11 @@ class XendNode:
                     pscsi_uuid = uuid.createString()
                     saved_pscsi_table[scsi_id] = pscsi_uuid
                 else:
-                    saved_HBA_uuid = saved_pscsis[pscsi_uuid].get('HBA', None)
+                    try:
+                        saved_HBA_uuid = saved_pscsis[pscsi_uuid].get('HBA', None)
+                    except KeyError:
+                        log.warn("Multi-path SCSI devices are not supported for XenAPI")
+                        return
 
                 physical_host = int(pscsi_record['physical_HCTL'].split(':')[0])
                 if pscsi_HBA_table.has_key(physical_host):